Fixed merge issues

Restore Jacob’s version