added more changes to structure