Major changes to mobile implementation