put toys.cpp on upstream