Revert "Revert "further updates""

This reverts commit d79652998665b3ec3f053f8a55a79461cbfc4bd3.