Some minor modifications...