changed some constructors