second (working?) attempt at supporting all versions again

second (working?) attempt at supporting all versions again #39