more changes ..yay!