correction of last commit + some merging