added comments and names