JS7 minor tweaks, id artifical function include