YJ- minor changes