Changed the constructor to take that into account, and changed the calls to the constructor where it was needed