updated to work with latest hell