i've moved these out to two seperate helpers