Add @cboozer2166's changes