Removed grade hardcoding