Moving to spf for models