I made some changes to the constructors, hopefully it passes