Changes to structure in order to elimnate error not found