merged files from zeples 27apr