Removed from members, added to cs196