Further updates
Fixes merge conflict