Changed $app paradigm again