Updated Few things