Removing a  bit of abiguity - please correct me if I'm wrong.