Follow-up commit (small additional changes from previous)