Initial update based on Hector's realign