Code

add fields for delayed pick optimization