Updated with Plot 2 code