Just a recode and few fixes