made a little more portable