some more modifications to Application