Seems to work - removing comments