move away from using the kitkat constants