consolidate steps
Revert fbd385d..86206dc

This rolls back to commit fbd385d6c63f9cb9b4e4deddab5d2f43d862c797.
Revert 86206dc..2a02860

This rolls back to commit 86206dccde2a51b5c2590934dc5766eaa578f227.
Revert fbd385d..2f31869

This rolls back to commit fbd385d6c63f9cb9b4e4deddab5d2f43d862c797.
Revert 86206dc..2cb12e0

This rolls back to commit 86206dccde2a51b5c2590934dc5766eaa578f227.
Revert fbd385d..a98b997

This rolls back to commit fbd385d6c63f9cb9b4e4deddab5d2f43d862c797.
Revert 364b098..3765835

This rolls back to commit 364b098540e2438dcdaa3819055f0874552b4898.
Revert 86206dc..bccb7bc

This rolls back to commit 86206dccde2a51b5c2590934dc5766eaa578f227.
Bugfix in ISO calc