Updated templetes