Fixing isues
Update