removed extra code from wrappers