made some changes yo