Update templateWithQueue

work rev with two different passwords.
TO DO:
Make another template with single password
Fix the slight delay