New template and other changes