Initial changes to allow more than two diversity images