Ok, will update to handle those scenarios.