Modified to work with new zone program structure