add s05: reorganize model