Modifying Wrapper Function