updates for simplification of mobile stuff