Rework to be less confusing #94
Rework to be less confusing #94