Updated some figure code