Fix upper bound condition, and better drawelo