Added part of Jaume's suggestions