Algorithm tweak
arg support