more solver
Before making drastic change using bitmaps