Swapping normalize for base file