merge with Sergey's fork.c