improved wrapper