some removed/added comments