Before clean up
Update