WIP: Improvements from user suggestions

What if the size > 2?