made it a little more runable