Changes proposed by mfojtik