Make this a bit easier to expand