added latest changes from master and started js work