changed functionality a wee bit