Changed some few code lines