updates to take into account the suggestions made by andre and also added changes so that there is only one import script