Starting to get close to perfect results now!

Change-Id: Ic252edb58646b5be043f0052c97094848cd62417