tomy
some changes