rearrangement of methods; confirmation everything still 'works'