hmm some changes