adjustments [#discussion_r16340407] [#discussion_r16340516] [#discussion_r16340559] [#discussion_r16340791]