The DB arg is finally gone! plus logging is better now