YJ- working on main page