add and clean up