Choose is in basic working condition
Merging changes.