Camera fix/OneWay update
Merging heads