refact 8.10