Improvements, shame on this commit too