Tidied up code a bit and added query to find all users from NZ