updated the file according to fernandos advice