Changes for new plots