Made new some changes