Another tiny update.
Move everything to new paradigm