Changed Defaults

Change-Id: I1f7bf08605d82b6e6caf4c4a88e12b2de820c006