got rid of match, companions & object