++ some modifications ++