always ask your local immi for the folder they have for their requirements because they are not all the same from immi to immi. And your non-o was an entry permission and was basically used when you entered and replaced with a permission to stay - the length of which is based on the visa type.