More improv on tablet version