workin but still templates fixes
works but still templates fixes