Modified a bit..