making some changes
more weirdness