Lots of things reworked