this change is pending the other bug on name RHS that we have been talking about on issue 14 - we should likely deal with it there or hold it for a bit till issue 14 gets fixed