finish wrapping of remaining functions