improve
better mechanic for different machine config.
support org remember