Updated with phase2 stuff at Ericsson.