template changes
changed decorators logic, yet another aproach