Adapting to new template