Working on changes for release