changes after adding base template