Revert "Revert "Daniel Dilov 13""

This reverts commit 326ffa61e84b18fa2080360c107fe58984663414.