fix: made some changes