Incorporated Jaume's suggestions