merge with templates and loging session
merge with dror