I like this approach, part of latest commit.