rollbacked version
removed superlogging for now