Updated Normal generator