YJ- minor updates