added mobile logic
continued work with mobile part