beta

Structure fixed.