Completed merge with ben/helios