small changes to structure