It looks long but much of it is pretty trivial changes to call a different function