Samuel's comments applyed, tests in progress