UPdated renders and templates