here is some updates
some changes