Adding missing modifications from last commit