Updating templates more