1.4.6 changes (needs testing)