Submitted version
Updated app manager