little changes, no Console outs