revert to non-augraph
add with mixer
organize a bit