Removed UI, updated to work on iOS