template added, but serval things broken, need to fix this