Updated with Normalize components