Randbats changes