Start to optimize drawing. Add in REPEL.
Resolve merge conflict.