Was just trying to stay true to the original api if possible