Mainly adding comments