updated to work for mobile