some realy important changes