Incorporate both algorithms on all demos