Hopscotch table improvements