rework to support methods with non chars in it (VERSION-CONTROL)