Updated/added comments