Track more inline with AOKP