some updates
some changes