made lots of changes to the hand-holding code