make 2 functions "return x;" to simplify next patch