Changes based on Maxi's suggestions