more changes.. ugh