Moar changes. Reduced code size.