update of a lot;)