removed rjs optimisation