some changes after reading babcore