some bits of changes