Reworked js