updated legacy to new condition statements