Apply Teo's suggestions