not complete
more little changes