refactoring pt.3
 js crash fix