Fix model output
Fix template