added more structure stuff