make it more portable