Added Comments as per Apache Standards