fluidity improvements