made some changes meow