Just some minor modifications....