modify jooo by peter