Reduced read calls like delan's earlier patch