some changes
tmp
some tests