Some Alvaro's suggestions applied