changed js order