Update to allow basic functionality to work