Patch before test
Changes from meeting