Move f, K back into Block