Did some clarifications to the definitions after testing