Few Fix applied
Fix again