Clean-up & add