updated, fixed 24.4 integration bugs