updates and clean up
new args