updates and clean version