ticket:1. Added changes according to comments