Changes made according to feedback from Juan and James