Few changes from last oteration