Case number 1 & 2 is done
Sync with raymond