One method added, some changes made to existing mehods to catch corner cases