JJS update (choso added and todo moveset out!)