whoops, accidentally rolled back some of the new syntax