A lot of fixing, cleaning and modifying