Tweaked the constructors