changed checks to use graphite handler