rename methods and add some log outs