cleanup and add more