Removed wrap function