Undid accidental overwriting of Mark's changes; fixed fallbacks