fixes for running again
add template