Changed so members are correct