Added better user supervision