some small modifications....