If you have a chance, could you change this to the ts syntax?