added more structure