Update to use loz's changes on their repo