new math

Change-Id: Id98d663421330d8255a2adf65bcb0aeaa82f67bf