Updated code to last WIP