Refine things a bit...