Updated figure to be more flexible
Minor edits