initial effort to modernize this gem