reverted changes since they break the book examples