Redone all the changes after fixing wrong commits