removed 1s from thens