minor adjust and testing