now updated for also chosing dbname