Made changes to work