Some mistakes has being corrected