Changed Example Data, Moved Functions