few changes including production hotfix