updated assumptions
updated