Cleaned up output a little and went back to the default algorithm