updated behavior and comments
removed functionality to debug