updated to incorporate aokp changes