Update to application logic

Update