Improvements

I think this should be logged too