changed 'on' to 'visit'
removed commented code