Fixed Application logic