Added a few lines that was forgotten in merge