changes to work with the new fork