Updated to remove code for Plot1 and Plot2