Rests + wholes recognization added