Changed preprocessing