make it more version generic