Incorporate jrochkind enchancements