[UPDATE] testing further structural modifications