Untested... looks good.