Merges Joe's and Ian's work