Uhhhh yeah.... so some changes