Small changes to prepare for next step