Made changes you requested