Changes to overall syntax