updating with working template draft