Still fixing everything