* #3: loggin improved, symmetric naming of both versions