Added Ranger and other changes