updated js macros