YJ- minor stuff