Track my recent modifications
Fix based on AOKP