MODIFIED: removed unnessary comments