fixing everything NAO!