fixes with bringing all the plasma stuff together