Interim commit: updated to work on mobile