Missing details from previous commit (merging test)