update to use new signatures