added terms && condicionts