Code modifications
Depend on -base's latest HEAD