btn and other changes