slowly switching everything over to jellybean-m