Merge branches 'version3' and 'temp3' into version3
working on approach mode and pause switch. still in progress