Added some figure stuff