A few changes to last commit