fix grade issue and timeout