nailed down a bit more design