added checks on offer and validations