Changed ordering of arguments to listen.

Also added argument shuffle to make sure we didn't break backward compatibility