reworks model and controller specs