Changes for the hybrid progam