Refactored to remove unneccessary scenarios