Overhaul the JS