Updated Application code