Revert ":boom: Some changes"

This reverts commit c2c96c313dd72ba943d6249111c38afe7e434eec.
Revert "Revert ":boom: Some changes""

This reverts commit e1eaa740469dee5261c03addae68104515e4b73b.
Underscore ideas