update to work post js refactoring