Updated to reflect latest changes