fixed + new stuff