comments updated - full project