Added count - not sure it's working right though...