WS: Comments added