Added validation and design modification by vikas