moved
added more templates