Modification from fork .wq