New changes. Just small changes in names and so on