Readded old js, for transition phase