Added more example data, fixed bug in logic