updated marta and shuffled