changes to reflect new work on fetch return type and startup