Updated for member working