Adding random unit selection