was fixing
merge
updating py for new JS api