change and clean up