Changing code stucture.