Better logging; symmentric code