Hopefully all done for the next version