Consolidated into one file