updated to support hex again