left things commented out - fixed now