In good working shape

Tested