DEV-64 | change some code