Conflict with merge index2, so i have to do one more commit.
Hope it's okay now