fix basic structure