Updated: Final template change