improved data handling + added some placeholder