restructuring for peewee (broken)