Monitoring App Done Full with some changes