Final update

Everything is done