merged some changes and new files from production