Updated data tools effective blocks
Minor changes