Small change of methods used