comments added and working