add enhanced format support, not tested....lol