#3 fixed and ready to merge