Got em right this time...
Thanks Annex, Wally's idea lol

Change-Id: I1ce56a7e5d575f007dda559f7cb975221c3b651c