Updated with GA
minor updates