addinde comment from master
resolved conflicts
adding commet