Hopefully the last changes to syntax