Harry: changed the constructor being used in this class slightly