Improvements on core #2.