2nd Dev 1 changes