make it a little more flexible
add missing files