Made changes per requests