cleanup and picture change