Bump as a lot of work was put into this