Changes to add some bugs
WIP
WIP