beta version working, needs name=null fix