Replace more shit