Core Improvements: Next Round #79 #80