Updated to work on tablet