delete unworking code, and unified the numbers