Updating to bring inline with curse branch