clean up
add shots