Improvement

need 2 draw stuff