Update, please see the OP!