FIX switch to the new format syntax