Changing so that data is specified in the constructor.