Dev 2 2nd changes