@jrbasso I tried something a bit different in 212d8d8c2093b4b0966afd881820e9848cffd16c, what do you think of it?