made some interesant changes