Fábio's Code Added