Updated to plot mcake and mwall invididually