pre merge
who remembers all that