Fixed name
Merging mihai and mine