Reordered membesr a bit more