Adding code for use case 4.04
Committing merging conflicts, removed mdf and log file from commits