added origin to data and input fields