ok, will modify