Changed some things to be more like the fortran version