Final update for merge into single package