switched to JST templates