Moved back to full file for testing optimization