added if/else to include both processes (temp fix)