Fixed Up The Constructors