Reduced to one file