naming adjusted
methods consolidated