Removed the bundle method, this is cleaner