Merges changes I meant to add to the original PR