Improve Onion Skin code