no change
fixed 2 problem issue
Replaced the hardcoded users with template variables