Update to latest changes, certainly not optimal