removed data folder since not used
added logic