Finish more stat work