S5 to S7 Data Block Mapping

I'm in the middle of mapping some S5 data blocks to a S7 PLC. I've just realised that the S5 data blocks are all addressed by the while word in the Wonderware SCADA system.

For example:

DB200 D60.8 for the S5 is DW60 Bit 8

is that the same as the S7 for:

DB200. DBX61.0 ????????

or is it more complicated than that?

Here's the conversion table:

Thanks, that is very helpful.

So just to be clear on the last part of that chart.

If I have DB 200. D 20.7 in the S5
this is DB 200. DBX41.7 in the S7 ????? So the right byte?

If it were DB200. D20.15 in the S5
it would be DB200. DBX40.7 ????? So the left byte and the 8th bit?

Yes.