Add changes to get last step working.