More merging in Brian's movie and rollback code