Changed to R/S Hamilton Jacobi format