+ little changes (bad merge)