adding the baselist and removing the duplicated data / functions