preliminary changes to new resolve process