Improved some more