fixed new definitions