added version 30 support