add more fixes to make post-event
Move the changes since book to the public space