[UPDATE] Some improvement