added one drawing + optimized code