MAKE PRETTY + YETIAN's WORK