Updated to better use a figure