Revert "Revert "this should have been comitted loooong time ago""

This reverts commit 8cd88de592628465208340a1fb9fc132e8584a0a.