Moved adjusted variables to _custom.
Fix merge conflict