Update of the WIP, lot of things changed