Pull beta 2 changes