Update method now working optimally
Another template tweak