using tray service + revised eval function
Merge remote-tracking branch 'renxi/master'
update assisted detect, testing
Merge remote-tracking branch 'renxi/master'