refactored, added more sample data