Made changes #2