Changes to be more inline with NSF Requirements