3 Commits (ImproveDataHandling_#25)