updates from @ryanlizza