Adjustments according to JPs comments