added common + cleaned up logus