upgraded with new marlin releases