Names changed and comments added