created individual methods instead of switch, changed from _namespace to Namespace