[#76957592]Upgrated BaseFigure