[UPDATE]reduce number of line