redo arguments a little
add strategy completion