Update to match AOKP