Updated/Cleaned up phoenix file