Made changes as per Jonah suggestions