slight refactor of rests