Improvements on previous changes