Updated for beta 3 syntax.