Small changes to fit our structure