All old code transferred to new template