more changes to return content