* Reverted my last change. Did not work as expected. I'll create a branch to work on it.