[Phoo]: bug fixed & improvement (in progress)