little changes of structure and config.