updated for stormlib 8.21