Modified 'fab' for new cms