#7 improve Oomph setup