Few things modified