Added Adam's changes back in