Messing with the Algorithm - #688