adding changes from jsadev