09.06 update
remove old
update template