Added swap & randomInRange