fixing everything?