adapt to latest firm changes