fixing everything !