Updating after much work