fixed new stuff