Updated with ng corrections