Re-did Oregen Files, hopefully they work