Made some tweaking.