#46 improved