Add debug + Revert to old method + Fix color bug
Add debug + Revert to old method + Fix color bug