Minors changes
WIP