changed names and added comments