Switch to using the <- syntax for everything