added names for input and removed commented out shit