add method switching as described (wow that was a quick implementation)!