Derp && More optimizations
Will test

Change-Id: Ic9a1181da7fe35b93b50015158c15cdb7c8ffb19