Minor modifications + prod transfer