Try some improvements in the draw time

See title