Some changes to Basic preprocessing tools, v2