more changes lets hope we didnt' break anything