#19 added more coments