Fixed plots and added new draft based on Justin's suggestions