changes implemented for helios adoption