some changes in template, not work now