1. Updated templates after feedback