more adjusting for new FW from old FW