got rid of old structure