Technical changes

Technical changes