changed for beta 2