clean up..
remove unused args..
improve handling different data structures..
use correlation api..