Revert "Small fix"

This reverts commit 31bae8afa5590bf947e975bce6505dc55693f27d.
Major update

This update features brand new code, fixed code, cleaned code and
generally just amazing stuff.