changes for beta 25th