version 1.1

Updated methods to reflect simpler solution and less code