enable for beta 2