Checking in clean source (v19, jan)