Revised parts because of Pabl
o