Commit Feature-2

Please check these changes