Changed base template