fixed commented out codes