[IMP] Improved JS