got to same point as java branch!