WIP -- final tuning