new dummy data + some refactoring