Changed the constructor