More improvement on paintbug