some changes on base template