made it more instancy