Modified to make that Eric's recomandation