Consolidate my work with Patrick's