Big update for release 2