Updated Solutions - Code and Plots