Took over new code
Fixes