Updated to deal with drama