finish merging jnthn's patch