Update per Maciej Swiderski's recommendations