cleaned up for mobile