added logging, renaming