Some Changes let for working