WIP: working on configuration and fine tune parameters