added more basic structure