Last few changes from previous commit