hopefully all done now