Few changes all around