Added a constructor that makes more sense