Added Ivo's requests