Modified to meet pending items. need to be tested by team.