I've done some changes