I don't really remember what i changed. It's all good though.

Change-Id: Ia1de9febdea70e8cd1b20fc984e04ef03c8c1772
Signed-off-by: David D. <davidoftheold@gmail.com>