little modifications
some simplification