#439 complete modification