Changes on main Method