Last old version commit - minor adjustments