2nd commit : mod rename and few bug fix.