This should be moved up to line 45 to ensure consistency