move more to templates