same as last commit, just added comments