JS fix
Major enhancement