Tidied up a bit and added fake inactive resident