Design is much easier and loosens the coupling

Thanks Jon!