removed commented code
Added current view - working version