change to better js