comments and expansion of some code
comments and expansion of some code