Improved some more performance