some template chanes and model adjustment