Sending francisco's commits after a few minor changes