Some changes in draw tool