First phase of Dev003
Merging Dev003 first dev