excellent progress on both