trying to make non ota easier