Fixed up for easier testing