minor changes to js order