minor ajusts for simplicity