Release 1 changes

Release 1 changes