1.2.6: Minor refactory!