improve the fucking js