Mainly added comments