Made changes to main