A few things modified