fixed js AT LAST!