Alligning with jonypx09....part 2

Change-Id: I823e9314a4a739c5f5f93a370307a79de0547844