WIP to adjust for new syntax