personal tokens moved out, functionality tested ok