Solves errors, but not sure interface is indeed what users will expect. Will ask GP team to check on this.