Sort out the basic definitions a little more