Revert 2af1a2a..2cfe19e

This rolls back to commit 2af1a2af3c36d1ca131825b0e27fdb6de894750d.
Revert "Revert 2af1a2a..2cfe19e"

This reverts commit 5a0f4a5bd3d4cb40ced18ed6188769dc8affe984.
Updated content of works