Messed up the merge. This is better.