Ray Ellis returns from multiple knee injuries