updated with recent progress on the patch